Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 25 Oct 2011 23:01:16 +0000 (16:01 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 25 Oct 2011 23:01:16 +0000 (16:01 -0700)
commitca52547d0a0490b6194449f05730a62eeed91866
tree06417d4f81c18480500efe9b8255cf2b912d6ffe
parent2cd5aafcf637670e2c2c1c2160ab70b5b35695a3
parent28e6363d3d0c7bb334d188c6dd01ea5cd71cb542
Merge from trunk.
src/ChangeLog
src/dispextern.h
src/keyboard.c
src/sysdep.c